I think I've fixed copyright notices as requested