improvements and fixes for es-MX