many tiny changes