Finished up some inline comments and javadoc'd fields.