First round of changes after discussion with Nate today.