Many improvements & clarifications.