Bunch of changes to reflect talk with David