fix aam basics for features