ant build mostly working, some other minor tweaks