cleaning and other updates