Fixing doc and cleanup
Changelog