another combo PR

combines various PRs and applies style fixes, etc.

included PRs:
@JensTimmerman: #534, #547, #578,