Changed and Added Comments

Fixed comments and added some more as well as added annotations to the
wireframes.