Optimizations, bug fixes with addInteraction, removeInteraction