finished detect_disk(), other changes