Small improvements and tweaks to time-spanning