Updated goals
Finished core.model javadoc