Minor fixes
Fixed conflicts
Added first sponsors
Fixed conflicts