Major bugfixes in attack