various fixes
Merge pull request #39 from sandersonet/update

various fixes