some more fixes :) encoding