further fixes to A/R functions