Minor fixes, added exit command