Fix some typos
Merged amip decoder improvements