Improved dispose methods
Increased maximum number of retries
Bugfixes and improvements in retry / abort mechanism