resolved some encoding issues