Correct encodings, improve build, clean spec