wip/mousetweaks
