A couple of comments. Need to fix the update-copyright-year :-(