Fixed some javadoc + correction