Various fixes and improvements.
Do not wash dogs.
Tested leap.