fixed a few issues with exit, and still having issues with the comments