CG Updates and some SDL2 changes