Update Copyright
Some minor improvements