Lots of updates to get the darn thing to build again. There seems to be an...

Lots of updates to get the darn thing to build again.  There seems to be an inconsistency between the gms and froid versions of the datafiles which is resulting in crashes if you regenerate for one build flavor but not the other.  Nevertheless, this change seems to build a runnable version of the GMS flavor.