add a few dates and fix timing issues