Adding some touch up and adding the comments