Fixed up some various code acillary to the player system