variety of updates to better conform to real GLX