slight work on widgets and clean-up