Restored tracking, fixed arrows keydown