bring back `doc` req type; many little fixes