Fixes to encodings, spacing