making a bunch of hacky tweaks