Updated Javadoc.
Added Override annotation to interface implementations.