stdout/stderr edits

@samccone