Several awful bugs relating to time fixed