Made the naming and storage of game boards a bit more reasonable
Some misc cleanup
Cleanup and tweaking