more safe DecodedData, small fixes