Improve some docs

Change-Id: Idf9e175aec00c0c82075e693656fd38f42cd13ce