readded mouse support
merged