AA april commit

Small MVPaa imrovements
SPM_mods removal
aa_dir, instead of dir