- Added documentation comments
- Tweaked demo