fixed some comments, redid javadocs