misc clarifications and fixes