fixed bugs realted to wrong data flow errors (variants, functioncalls)