More gfx improvements