fixes to copyright and wrong merge
udated configurations