Slight improvements - collision detection and simple recovery.