Correctly handle prompt printing
Make EOF work again