Timeline bug fixes