Clarification fix

Applies to #240, #167 and #60