Recovery and cleanups. More work on widget api.