Tweaked level logic, fixed bugs