Added support for right button and wheel, cleaned up