Fix some text and move a function.