Comments PlayerState
Merge branch 'pim'
Small fixes and console adjustments