fix a crash; misc other changes
Merge branch 'master' of https://github.com/pbsurf/touchwidgets