better rcflow / some fixes