clean up a lot, and added a few things