Restore some dev branch code & fix KillRot since I broke it