Updates to cg_public.h and surfaceflags.h