Some small improvements.
Finish implementation of decoding.