Small Changes...got received data working

Merging my changes into Master.