proper tomorrow handling

error needs to be changed