Minor additions, having problems dealing with the table format.
Merge branch 'master' into widgetlist