Flak cannon liberally applied
Merge pull request #763 from psav/flak_cannon

Flak cannon liberally applied