Preliminary Round Fixes
Merge branch 'master' of https://github.com/aliceffekt/waitingForHorus