Fix typo in last commits
Fix copyright statement
Comments; Better support for really-disabled mode