Misc changes based on March meeting.