module controllers

added comments and minor changes
Merge remote-tracking branch 'origin/master'