Add comments and style some code
Minor bug fixes that aren't really bugs
Remove template from MasterController