working num formatting, number edge cases. db updates forthcoming