Fixing time bug and adding days