Updating copyright and cleaning up some debug statements