several fixes of latest changes; now tested on relval samples