Fixes GL Errors and changes more deprecated functionality to equivalent

An extra glPushAttribs must have snuck in while doing the merges, it even had the same comments on it.