more build tweaks
more build maneuvering
ant build tweaks