Corrections, added JS insertion of commas into numbers