Editorial improvements as of Pablos request