cleanup and bugfixes, WIdgets know Resovlers