made a bunch of tweaks