minor tweaks. Mariano, take it away!!!