fixing some encoding issues