with more misc fixes and -- TODOs (will request a couple looks into en_us too)
Includes miscellaneous small fixes, such as wrong stat numbers. Next up: other stats markups, non-stats markups, fix text typos.