Notes from 2/17/14 and more edits

WOOOOOOO