finished up a bunch of stuff