clean up and additions