Revert "Revert "Fixes and stuff""

This reverts commit cb883cf77e87afa0264db77277e80492ce513a7e.