Minor bugfixes
Merge branch 'master' of https://github.com/aaronjosephs/BTV_project
Minor bugfixes