some clean up and my thoughts on part 3