lots of tiny changes