Copyright and comments fixes