Clean up VGA type selection; far too many variables being used to track one state...