finished Detector improvements, generally added approximate timing info as comments