Some changes (line comments), upwind distance corrections