Fixed regression in controllers. Added few comments about controllers at hand