fixes for attacking

should work properly now