Added clean KeyboardInterrupt stuff and "fixed" something II.