Copyright and some improvements