Renamed Contact object to Player. Minor other changes.