more clean up, updates to player, added contact