Added time compute and minor fixes.