Interaction code + thesis small fixes