Simplify time management and fix 'ponder on' bug