a bunch of small changes