clean up and updates