Changed some javadoc, and renamed methods