Fixes and typos following review.