Various fixes and clarifications.