- moved to using kvoptions for option declaration
- other minor changes