Docs and bugs fixes