Updated GameWindow.cpp with Jeff's and my changes