Add stream to callback
Use tabs
Tweak CLI