Cleanup & Flicker fixes

Cut down on some of the flickering, and file locking issues.
Consolidated the timing code so all the management is done in the same
place.