refactored comments form
some notes on roles
patch :bomb: