minor tweaks as per robfig