Touch up of current code.

Separate branch because this computer uses a newer version of Visual
Studio but an older version of OpenGL.