Fixed encoding + minor changes