several small updates and a stream test