From miguel

a couple of tweaks