Improve build
Better Java build, better AST. Still some failures.