Undo absolute names
Polish to stream wrappers
Various fixes from playing with TK example