minor updates (comments, friend ostream, etc)