Improve alignment and make a bullet list
Merge branch 'master' into lou-experiment