Fixes Can't subtract offset-naive and offset-aware datetimes errors

Hey,

These are all the necessary fixes that are required to make this run properly with date aware timezones and fix the only open issue.

All the best,

Chris