clean up and add new sections