Text & code fixes from merge