Fixed datarate expansion issue and tweaked output.