a couple of docs, a couple of import simplification