Fixed bugs w/ time counter