Bug merge instability

a few more tweaks to get us back to a stable state