Bug Fixes

This fixes basically all the bugs I think Lopes noticed in discussion. Also added comments on some of the ambiguous enums in GameData.