fix day rollover
quote refactoring