Added distinction between and seperate code for no "out" and "out" detectors.
Added check for short wait and adjusted wait accordingly for timing loop.