fix the claw, switching and display