Made changes suggested by Greg C.