Rename more vars to be 1-based, improve ai1 and ai2
Disable ai1 and ai2 distrib plots