Zvi comments on AI #2

[Zvi]

(I fixed a few things, probably worth reimporting—confirming 3:55pm on a few new minor fixes)