Re-architecting and little features

timedelta, better flooding, better persistence