streaming fixes, all tests passing