a few more part 6 tweaks