improve multi-day support with various improvements