ExpressionHandlers
move binary expressions so build.sh still works
more changes