Synched with OpenGL changes. Added more instances. Some infrastructure updates.