Added an override to correct values..

And I need some way for it to realize when I'm working past midnight...
Make it fit a little better