Updated javadocs
Made a few things more clear, better formatted, etc.
Merge branch 'master' into unstable_staging