Fixed double comments problem, cleaned up comments controller. Fixes #85