minor changes to public stream layout