Added tracking of numbers.

Fixed logging issues.