Updated versions, cleaned up javadoc