edits to java gen