FINAL PATCH (For real)

There was a couple more bugs that needed to be fixed, but you honestly can do without the fixes as they don't affect much of the experience. Still however is available.