clean up and add some items