small improvements
Merge branch 'feature/awssummit'