Add Comments controller
Minor fixes on controllers