more fixups on the timeline