#125 aligned mousemove with recent changes