building edit polish
minor edit for style
Merge branch 'eddie'