Number tweaks
Refactor most stream logic into "stream" struct
Introduce "volume" style