Fixes for encoding and other things...