Tidy up and get IK working