Added some missing javadoc and small modifications