Misc timeline fixes and refactoring