cleanup of David's commit
some docs