Fixed last enumerators, made a little error checkign in country init logic