change o_stream back to stream

so that the tests don't have to be updated
also a fix for o_fd/decriptor