Replace Type enums with classes, comment Achievement code, fix old javadocs