Fixed Forfeits

And a few other little changes