Updated year
Fixed some comments to remove compile warnings