minor changes
Merge branch 'seth'