Added player entity improvements mentioned two commits ago that were somehow lost during a rebase