Slimmed it and fixed a few game-breaking bugs