- Fixed compilation errors caused by recent feature refactoring
- Tweaked comments