Added more waves, balance, etc.