Clarifications and fixes