Fixed a few design issues and also completed issues with #372
Merge pull request #400 from scouttyg/bug-fixes

Fixed a few design issues and also completed issues with #372