updates to resolve issues 82 plus scrub of AVP sections to move behavior to other sections