added scroll-wheel support

- scroll-wheel support
- cleanup in the code