Updated copyright notices, more entities and updated Canary.inf.