cleanup, comments
converted additional widget classes to extensions