combo PR

This PR combines the work done in other PRs, and applies minor style fixes on top

Included PRs:
@ajdecon: #556
@wjurkowski: #592
@apanteli: #538, #598
@wpoely86: #611