Tweaks to config, number format and watchdog thread