core tweaks