added a timeline entry and edited two