clean up formatting, tweak build.xml more