misc updates
Merge branch 'master' of https://github.com/brendan-duncan/dartray