Updated to reflect changed timezone fields
General tidy-up