waves working in conjunction with powerup & gameover

fixed some borked up code created by test data; powerup & waves working
correctly