ax -> afr ; more cleanup, add ark