Safety mode, fixed some crashes