Finished editing ch2, fixes #1.