Clean-up
Adjust number sanitizing
Improve sorting under colspan'd headers