Numerous updates, but mostly bug-fixes
Merge pull request #39 from thunsaker/fix-the-bugs

Numerous updates, but mostly bug-fixes