commiting changes
Made exit a little more reliable