this will in theory be the final actual commit here, fixed bug about timezones