Fixing up some stuff, death stuffs