various cleanup and updates