Fixing some values...still no player
More cleanup