Doc and api doc updates