Timeline is features complete. Fix some issues