truckload of docs, and some small improvements