fixes and clarifications