minor cleanup and doc work