Removed to tags and added some missing javadoc.