fixed some encoding issues in the master