fix teleport, make refuel modular, fix suicide