Fixed some missing assignments and javadoc.
Merge branch 'develop'