Number with commas
Lots of tweaks, also add in advanced uploader