Licence nuisances added.
Unimportant improvements added.