Clean up, handle errors, better icons, new version of Widgets (not in repo...)