Add timezone management
Misc bugfix