Minor cleanup
Fix timezone not applied to calculated dates
Add demo