fixed some encoding issues