Some additions and changes to PerfectPlayer