More OpenGL draw command work and fixes