Some tweaks, also changed placeholder player