Refactor: misc todos, including usage of player avatar.