Fixed some time issues. Although one still exists, the >= 16 hour issue.