cleaned up. updated vma.