Bugfix: Added some more simplify_time()