Futher fixes
Improve docs