Attack fixes

Fixed some bugs in the new attack system.