Fixed project and tidy timer code