Made some minor changes. Still working on the time zone thing.