fix regressions, corrections