Various fixes (for #25, #39 and #26)

nit: maybe instead of "unless stated otherwise" you could say "unless imposed otherwise"?