Clean up and add some new stuff