remove a few thousand warning (git diff) and add more mouse support