Battle Fixes

Bug fixes in cloning factory, and damage dealing