Bugfixes, widget improvements