cleanup and some updates