Some clarifications and tidy ups.