Minor prompt fixes and new vim things