tighten up friend interaction of ijsource to only ijstreamoid and other minor clean up