improved locale support