Civil Warfare: Fixing bugs

last one today