many tweaks to support dynamic UI updates