update to latest with improved click handling