Adding mouse support + other stuff