Expand javadocs. Add @Override to implementing methods