Bugfixes for attack

not done :(