cleanup and updates