various tweaks to components