Add free-space check & tweak prompts