finished testing and fixing tapstream, see #21