Interaction updates
Various interaction updates
Various interactor improvements