some improvements/corrections for interactions