Bug fixes. Closes #77 #73 #79 #76
Merge pull request #83 from thunsaker/bug/first-wave

Bug fixes. Closes #77 #73 #79 #76