Master aic

CND typo and config cleanup