Copyright update and minor bug fix