fix up errors and omissions