fixes for various regressions introducing affecting trees + adaptive nn