More changes
Updated copyright
More updates