mostly doc and minor cleanup work