improvements all round