clingy dan fixes
Merge branch 'master' of https://github.com/MaybeSacred/ZOI