refactor warp for sanity
fix shots not cleaned up entering warp