Formatting
Uncommented weight/val updates
Major expansion of short_stats parsing