Debugging stash.
Merges and bugfixes.