finished some javadoc and comments