number format and a few minor changes!