mouse fixed but extras untested