Fix minor typos, two line lengths, and a repeated include