Spanish fixes

Spanish fixes
merge