vm mapping improvemnts