Added Comments, Fixed Bugs

Ready to post on Google Plus