improvements to aam benchmark