#424 dangling timezone issues and other minor problems