New upstream
Fixed some patches
Fixed copyright info