Bug merge instability

work in progress... tracking my tweaks here for review.