Fixed some missing assignments and javadoc.