Stat Screen Cleanup, Round 1

Using conditional concatenations.
Stat Screen Cleanup, Round 2
Stat Screen Cleanup, Round 3

* Little more code cleaning
* Added some cock stats
Fix for #551
Typos in #494 fixed

A few were not actually mistakes, left those alone.
Fix for #562