Various Fixes

https://github.com/Domoconnor/Coursework/issues/5
https://github.com/Domoconnor/Coursework/issues/6