Miscellaneous improvements and bug fixes.
Merge pull request #266 from ryneeverett/issue52

miscellaneous issue52 improvements