fixes in part 1