Hopefully this merges

Click event fixes, other stuff