Feature/155

Merging a few tweaks from this branch over the past few days.