mainly cosmetic
Merge branch 'erwins'