Fix transcoding
Improve sources