Refactors, fixed real time bug, and fixed time zone bug