minor bugs found/fixes, see last commit on widgets for changes