annotated timeline works, cleanup