- adding support for setting/retrieving watch options and settings
- fixing typo in log command preventing compilation in safe mode