001: redo timeline and clean up formatting