Some grand strategy mode code improvements