generated class members changed to private + javadoc corrected