Bug fix + daysLeft function