Cleanup and fix small regressions from OBJWIN work
Cleanup and fix small regressions from OBJWIN work

JershXL/gbajs,endrift/gbajs,endrift/gbajs,matthewbauer/gbajs,ElliottAYoung/gbajs,matthewbauer/gbajs,ElliottAYoung/gbajs,JershXL/gbajs