A few clarifications and fixes