removed duplicate functions some bugs fixed, some bugs added some other changes, can't remember them all ;)
Number of variant dependant code change so all changes can be done only in xform Test mode for new variant added