Added javadoc and limited interecting.