Added number format

Added settings to manage the number format.
Bug fixes.