Fix missing tags
Remove cruft, reduce timeline space