added timer controls
merges matt's changes