Formatting Comments

Adding and formatting the comments includes changes to the java doc.