Updated all Javadoc and some minor changes to entity classes.