add tenant into the doc, fix a few minor issues