merge of images: streams and knobs
stream prep and socks work.
merge tweaks pointed out by the compiler.
clean up