Some small changes and javadoc additions