mroe re fixes to tavi