Typos and fix all the headers.