fixes to swagger service, with associated changes elsewhere