Use new underscore version.
Fix remaining time calculations.