more clicking improvements
even more improvements to clicking