Made wave bonuses work
Merge