Added missing line breaks to 2 code samples; other minor changes
merge