- Minor corrections as a result of John's code review.