fixes and upds
Merge branch 'master' of https://github.com/everdimension/newdnar