Minor fixes and moved from iControlMode to iInteractionMode