Fixes for #22, #23, #71, #68 incorporated into widget patch mod.