all the random fixes.
Merge branch 'master' of git@github.com:Deeg-Kim/Everything-Dojo.git