Fully Fixed Draft

Finally, no more errors from what I can tell, all works perfectly.
Didn't get to test all the other game modes to make sure it didn't mess
something else up but hey, can finally do this correctly.