- Some improvements on decoding