Updates to a few javadocs, fields, other minor bugs