clean up and minor update