Fixed video cards swap drive, minor tweaks