thanks a lot for playing and giving feedback!
i am not sure exactly what you mean about a bug where you dont go down the full hierarchy of shapes. in terms of the shape characteristics, when your hp is reduced, you will gain the new shape's damage value and movement speed, the only thing that doesnt change is that you keep the score multiplier of the original shape you chose. if you arent talking about that then i would love to know more details about what youre describing.
and yes a currently the "waves" are just a timer going off every 10 seconds, definitely place to improve in making it more explicit and perhaps more interesting with scaling :)