Develop

Pushing out some minor changes. See commit messages for details.