minor changes to enemy waves
extra adds
resolved merge conflicts