fixed tap/click stuff, and cleanup