More mouse improvements