Update 12/30/14

Significant edits and additions.