Fixes and clarification