A lot of fixes. Intermediate commit.
Merge branch 'master' of github.com:jhilary/Java