QP-stream WIP
minor tweaks for the QP stream
TDD
Tests