Bug updates
Merge branch 'master' of https://github.com/CAH-JeffreyNorder/hackathon