fixes etc
Merge branch 'master' into promise