encoder improved, functional fixes