added traps, warps, saving, and prisons