Some cleanup and making players modular.