Make player clearer
Configure player
Fix scoping bug