Add Matt's corrections