Added a comment controller, added some tags to other classes