fix #155
fix #151
remove debug
fix #133
fix #156
fix up (look sharp)
Merge pull request #157 from UniversityRadioYork/issue-squash

Issue squash