- FIX: documentation fixes
- CHG: code cleanups and improvements