handling of task-specific out-of-ranges + some cleanup