Fixed some issues with the time counting system including but not limited to not being sorted properly