copyright date updated and some fixes