Continuing issue #17 as well as other balancing.