Mouse Improvements