performance and timezone fixes