Revert "Bugs and stuff"

This reverts commit 3b439971accb3745b15fc039a4d69a2d65a2573b.