Edited p11 a little, completed p13