aa.2, further corrections per Matt