fixes for widgets and others - stable version with older functions