some changes
minor stuff
Merge branch 'cscw'