crash checking and more stability hopefully