more clean up and updating