Updated time.rb, still needs cleanup