copyright update and cleaning up a few things