Bugfixes for attack (done?)