Lots more changes which hopefully change nothing but the clarity.