Fixes, improving docs