again some fixes ...
misc fixes again ... partitial recoding