making a bunch of small tweaks