Adds smarter defaults and works across months