fixed some documentation.
Merge branch 'userinterface'