Fix few issues and insert copyright
Update .gitmodules