Working correctly
Cleaning up code
More fixes for decoding
Fixed context clean bug