minor changes all round