lock-on-click + more fixes