More cleanup and improved text prompts