Inundation cleanup

Minor cleanup and updates.