A bunch of fixes (currently made on top of the previous patchset but shouldn't conflict much with a rebase) which are not extensively tested. If some people have specific decoders available, tests are welcome.