Fixed disqualify status and other stuff I missed