Beta Fixes 2

Fading/Aleph easier
Attack/Defence not scrambled
Incubator/Wait For It/Q04B changed/new
Bugs -= lots
Merge pull request #1080 from waveney/wav29

Beta Fixes 2