Multiple bugfixing and adding basic encoders