Tons of changes for timezone fixes