fixed softAE borks from merge
fixed amlplayer borks from merge