refinements and bug fixes to mexico