Revert "Changed and fixed more stuff"

This reverts commit 21a57aeeaf942147b334c890492ae671214db4a6.