more tweaks to AVM mode