From Eldskegg: Balancing and bug fix