Tweaks to world and player