Revert "fixes and such"

This reverts commit 9a2bca3a93861b2386bdf210600498cc5e98b96e.