Fixes errors and improve prompts