Added exception propagation to retry loop
Corrected tests and watchers
Added normalisation factor and corrected process