Bug fixes and improvments in attacking methods