Bunch of cleanup and a new prompt