Finished comments and minor edits