Tweaks suggested by Dip.