Excellent ideas, I had some ideas for how to implement better incentives to swap, but just ran out of time, but I love what you've suggested. If you haven't, give the endless mode a try, that (should) make staying in a little more dangerous as the waves go on. : )