Patches attached.

Could decoder be made faster?