a few cosmetic changes
Merge branch 'rick'
merged