part 4, minor fixes