clean up and add a few things.