Fix up the copyrights and some comments