lots of minor fixes
fixing merge
Merge branch 'master' of github.com:gxa/atlas
additional fixes