Added the @Override annotation and Javadoc where missing.