Ambient Combat V7

Fixes.