tweaks to core componants