VM names now reported for hypervisors. Fixed some math errors and small logic tweaks