closes #34 + TextWidget fix