Update docs and small fixes