Wave Improvements: more combination waves and more non-random spawn formations used