some clarifications and fixes