Coverted time system to use milliseconds, ints changed to longs.
Timer now based on milliseconds, time values updated separately.
Solves previous logic problem.