Fixed DDRx bug and data_flag weirdness. Clean up