Some comments modified (hope they make some sense...)