tuned;
local fixes may depend on goal params;
removed some add-ons from modules that are relevant for the inference kernel;