bug fixes and commenting
merge conflicts in mainController.js