Tweaked time variables, added factoring optimizations