Player animation fixes

Resolves most (all?) of the issues @edisonout pointed out in #2034.