Added a few more checks, adjusted timer of rotate wheel