Fix penalties

Closes #8440

Also updated the '@' window to properly display the player's current stats.