cosmetic cleanup
fixed bug where use clicks 'pass' too fast and causes an error
Merge branch 'clean-up'