made editing pass
Merge branch 'mybranch'