Filled in some todos. Minor grammar/spelling fixes.