Hunting stupid errors - discovered celery is not reloading changes;
Fixed problems with error reporting
Made sure the disambiguate procedure works