some additional tweaks