added some fixes
cleaned up comments
Merge branch 'dev' into feat/aprilfools
added critical April Fools feature