Safety fixes, add spanish