Starting to update for even better international support... may have broken unit tests.