Bug fixes
fixing build.xml
Formatting changes