A number of changes throughout --- mostly clarifying things