Minor changes all around
More minor changes
Last round of changes
Merge branch 'master' of https://github.com/RHITJuniorProjects/JrProj-1415-Mike.git