Updated javadocs
Made a few things more clear, better formatted, etc.