Revert "fixed quite a bit of things! read this description"

This reverts commit fb9a1b49efc92732b097ceca0f0ee2f53626b552.