Corrected stuff from awesome yet imperfect 3-way merge. Autocorrected champo's texts.