Bug fixes and style tweaks
Merge pull request #126 from bryan-m-hughes/timob-13224

Bug fixes and style tweaks