simplify wait task logic
complete disk-related features