Bug fixes for nvidia and Intel, should work now, w/o gfx bugs