Minor changes to p2 and p7 solutions.