various click-handling improvements/fixes