Fixing deal to work better, various other changes