Fixing the encoding + other improvements to the text