fix up more choices, fix fields