Ordering changes to the tracking entry model.
Reworked error reporting.