encodings fixed
minor fixes