12/11/13 additions

Resubmitting some prior edits, plus new ones.  Review prior days edits
before starting a new day and find errors I missed.