A lot of cleaning, refactoring, commenting and comment translation.
And fixed build.xml