Added Coaches and cleaned up a few other things