Some fix in part 2 (pictures, numbers)