Added timer - minor fixes