Added some javadoc stuff and sub-total for two exercise types