stability tweaks
merging complete