Updated comments

Comments and Javadoc updated.

Includes goals for Friday 9th May