A little cleaning-up.
Further refactoring and fine-tuning.
Key prompts now happen in-place. Displaying total time better.