More testing.
Stashing.
Various fixes and improvements.