New elapsed time feature and small optimizations.