fixed up some WotA and CG issues