Lots of bug fixes (attacking)