Update AAA.

This is a start, but more is needed. We should add more comments so they're all consistent.