- Fixes more bugs
- Adds control change handler