Some cleaning and clarifications.