Some fixes in timeline form.