Assorted edits after read through

 * bx - dan