various bug correction
Merge branch 'master' of github.com:thomlemee/nomaad