Some fixes and progress with follow_mouse