Added Javadocs and other comments