fix most distributions; add more comments