More changes for the dev branch. Some of them temporary.
Incremental temp changes.