further size/align changes, no more multi-deaths from aoe