fix regression and more