Small bug fixed. Exit still not working...