more fixes
adding timezone support!