Fixed a problem with single SFs (that are supposed to be arrays).
Added some number formatting.