dates tweaked, some cfp gaps filled