Fix bug where alt-click didn't use the right condition to determine whether to move the cursor
Remove some extraneous logging
Fix merge