improved a bunch of stuff