Fixed crashes, added reset button