Remade some waves
Merge
Made all creatures have effects