fixed small errors. continue java gen.