misc fixes
Merge pull request #106 from dart-gde/some-fixes

misc fixes