cleaned some things up, but there's a lot more that needs to be done.