fixes + encoding fix