misc fixes to zl_gfx and a few mis-merged preprocessor defs