Add edits from stacked-bars fork