Development

Encoding fixes