Bunch of changes, including smart aoe