readability and unicode fixes