added speed option; fixed timer