Fixed javadoc, added missing @Overrides