Prompt and update overhaul, cruft cleanup.