Finally added the disruptions to the list
Fixed some lints by removing old commented out code