Removing comments, and completely fixes #2