Added a exit command and adjusted a few things related to that