Fixed a bunch of things
Merge branch 'master' of https://github.com/communistWatermelon/laughing-ironman