Merge "Update/fix docs"