Continued work on AVM code.
Continued AVM updating.