Some fixed to the part 9 code.