more long decoding improvements