finished up a lot of stuff