updating all the today logic to make sure it works as expected