polish and fixing regressions