Fix typos accross the source before we go final (second half)