updated copyrights and some other cleaning