Improved interactive units. Fixed a bug in Detector.