Fixes #2 - a widget is finally present. A couple of other small fixes.