Change time function names to be more consistent, and check for zero divides, from Michael Reifenberg.