Fixed comments, javadoc, stuff