renamed variables to all follow the same naming convention
fixed bug where clicking on a taken cell would still put you in the waiting state