Looks like you are well on the way to sorting this problem body out, well done.