make a bunch of stuff better