Stash.
Fix some more bugs.