Fixes and stuff
Revert "Fixes and stuff"

This reverts commit 386f6ecec728aeb602e7b363168df860b071c27f.