- fixed some shutdown stuff