Day cycle

Fixes ready to pull into main