commented code, fixed isTapped problem.