Some fixes, still crashes when interrupted..