Revert correct <-> behaviour, make encoding info clearer, added type checking - to close #401 and close #437